From 293294da2884e88840800d797cca2e6b74ee3bb1 Mon Sep 17 00:00:00 2001 From: Gert Wollny Date: Thu, 10 Dec 2015 22:21:37 +0100 Subject: [PATCH] d/p/03_.. update use of dict path --- debian/patches/03_datadic_install.patch | 28 +++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/debian/patches/03_datadic_install.patch b/debian/patches/03_datadic_install.patch index 95dfe0a8..abc3e79f 100644 --- a/debian/patches/03_datadic_install.patch +++ b/debian/patches/03_datadic_install.patch @@ -10,3 +10,31 @@ Forwarded: no -INSTALL(FILES dicom.dic acrnema.dic private.dic diconde.dic dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION ${DCMTK_INSTALL_DATDIR} COMPONENT data) +INSTALL(FILES dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION ${DCMTK_INSTALL_DATDIR} COMPONENT data) +INSTALL(FILES dicom.dic acrnema.dic private.dic diconde.dic DESTINATION ${DCMTK_INSTALL_DATDIC} COMPONENT data) +--- a/CMake/GenerateDCMTKConfigure.cmake ++++ b/CMake/GenerateDCMTKConfigure.cmake +@@ -83,10 +83,10 @@ + SET(ENVIRONMENT_PATH_SEPARATOR ";") + # Set dictionary path to the data dir inside install main dir (prefix) + IF(DCMTK_ENABLE_EXTERNAL_DICTIONARY) +- SET(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}\\\\${DCMTK_INSTALL_DATDIR}\\\\dicom.dic") ++ SET(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}\\\\${DCMTK_INSTALL_DATDIC}\\\\dicom.dic") + # If private dictionary should be utilized, add it to default dictionary path. + IF(ENABLE_PRIVATE_TAGS) +- SET(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH};${DCMTK_PREFIX}\\\\${DCMTK_INSTALL_DATDIR}\\\\private.dic") ++ SET(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH};${DCMTK_PREFIX}\\\\${DCMTK_INSTALL_DATDIC}\\\\private.dic") + ENDIF(ENABLE_PRIVATE_TAGS) + # Again, for Windows strip all / from path and replace it with \\. + STRING(REGEX REPLACE "/" "\\\\\\\\" DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}") +@@ -104,10 +104,10 @@ + SET(ENVIRONMENT_PATH_SEPARATOR ":") + # Set dictionary path to the data dir inside install main dir (prefix). + if (DCMTK_ENABLE_EXTERNAL_DICTIONARY) +- SET(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}/${DCMTK_INSTALL_DATDIR}/dicom.dic") ++ SET(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}/${DCMTK_INSTALL_DATDIC}/dicom.dic") + # If private dictionary should be utilized, add it to default dictionary path. + IF(ENABLE_PRIVATE_TAGS) +- SET(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}:${DCMTK_PREFIX}/${DCMTK_INSTALL_DATDIR}/private.dic") ++ SET(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}:${DCMTK_PREFIX}/${DCMTK_INSTALL_DATDIC}/private.dic") + ENDIF(ENABLE_PRIVATE_TAGS) + ELSE (DCMTK_ENABLE_EXTERNAL_DICTIONARY) + SET(DCM_DICT_DEFAULT_PATH "") -- 2.30.2